Merge branch 'ui-improvements'

2020-06-18 18:53:19 +02:00 · 2020-06-18 18:53:19 +02:00 · be45ada288
commit be45ada288
parent e4169b3b1b 72c49c3777
40 changed files with 1334 additions and 1136 deletions
--- a/harbour-tooterb.pro
+++ b/harbour-tooterb.pro
@ -71,10 +71,11 @@ DISTFILES += qml/harbour-tooterb.qml \
    qml/cover/CoverPage.qml \
    qml/pages/MainPage.qml \
    qml/pages/LoginPage.qml \
-    qml/pages/components/Toot.qml \
    qml/pages/Browser.qml \
    qml/lib/API.js \
+    qml/images/icon-s-bot.svg \
    qml/images/icon-s-following \
+    qml/images/icon-s-bookmark \
    qml/images/icon-m-emoji.svg \
    qml/images/icon-m-profile.svg \
    qml/images/icon-l-profile.svg \
--- a/qml/images/icon-s-bookmark.svg
+++ b/qml/images/icon-s-bookmark.svg
@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <title>icon-s-bookmark</title>
+  <g>
+    <rect width="32" height="32" fill="#fff" fill-opacity="0"/>
+    <path d="M20.81,10H11.19a1,1,0,1,1,0-2h9.63a1,1,0,0,1,0,2Z" fill="#fff"/>
+    <path d="M20.81,14.62H11.19a1,1,0,0,1,0-2h9.63a1,1,0,0,1,0,2Z" fill="#fff"/>
+    <path d="M26.85,29.74a1,1,0,0,1-.66-.25L16,20.82,5.81,29.48a1,1,0,0,1-1,.2c-.7-.22-.7-.76-.7-1.58,0-.63,0-1.88,0-4.38V4.48A2.41,2.41,0,0,1,6.44,2H25.56a2.41,2.41,0,0,1,2.29,2.5V23.73c0,2.5,0,3.75,0,4.38,0,.82,0,1.36-.7,1.58A1,1,0,0,1,26.85,29.74Zm-10.16-11,9.16,7.79c0-.7,0-1.62,0-2.84V4.48c0-.3-.18-.5-.29-.5H6.44c-.12,0-.29.2-.29.5V23.73c0,1.22,0,2.14,0,2.84l9.16-7.79h0a1.11,1.11,0,0,1,1.39,0Z" fill="#fff" opacity="0.6"/>
+  </g>
+</svg>
--- a/qml/images/icon-s-bot.svg
+++ b/qml/images/icon-s-bot.svg
@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <title>icon-s-bot</title>
+  <g>
+    <path d="M27.28,14.83a5,5,0,0,0-5-4.72H9.7a5,5,0,0,0-5,4.72,1.32,1.32,0,0,0,0,.28V24a1.32,1.32,0,0,0,0,.28A5,5,0,0,0,9.7,29H22.3a5,5,0,0,0,5-4.72,1.32,1.32,0,0,0,0-.28V15.11A1.32,1.32,0,0,0,27.28,14.83ZM10.85,21.32a2.81,2.81,0,1,1,2.81-2.81A2.81,2.81,0,0,1,10.85,21.32Zm10.3,0A2.81,2.81,0,1,1,24,18.51,2.81,2.81,0,0,1,21.15,21.32Z" fill="#fff"/>
+    <g opacity="0.6">
+      <path d="M17.67,5.06v5h-4v-5a2,2,0,0,1,4,0Z" fill="#fff"/>
+    </g>
+    <path d="M30.43,19.55c0,2.61-1.4,4.73-3.13,4.73h0a1.32,1.32,0,0,0,0-.28V15.11a1.32,1.32,0,0,0,0-.28h0C29,14.83,30.43,16.94,30.43,19.55Z" fill="#fff" opacity="0.6"/>
+    <path d="M4.7,24a1.32,1.32,0,0,0,0,.28h0c-1.73,0-3.13-2.12-3.13-4.73S3,14.83,4.7,14.83h0a1.32,1.32,0,0,0,0,.28Z" fill="#fff" opacity="0.6"/>
+  </g>
+</svg>
--- a/qml/images/icon-s-following.svg
+++ b/qml/images/icon-s-following.svg
--- a/qml/lib/API.js
+++ b/qml/lib/API.js
@ -89,11 +89,13 @@ var tootParser = function(data){
    ret.avatar_static = data.account.avatar_static

    ret.favourited = data.favourited ? true : false
-    ret.favourites_count = data.favourites_count ? data.favourites_count : 0
+    ret.status_favourites_count = data.favourites_count ? data.favourites_count : 0

    ret.reblog = data.reblog ? true : false
    ret.reblogged = data.reblogged ? true : false
-    ret.reblogs_count = data.reblogs_count ? data.reblogs_count : false
+    ret.status_reblogs_count = data.reblogs_count ? data.reblogs_count : false
+
+    ret.bookmarked = data.bookmarked ? true : false

    ret.muted = data.muted ? true : false
    ret.sensitive = data.sensitive ? true : false
--- a/qml/lib/Worker.js
+++ b/qml/lib/Worker.js
@ -1,5 +1,8 @@
 Qt.include("Mastodon.js")
+
+
 var loadImages = true;
+
 WorkerScript.onMessage = function(msg) {
    console.log("Action > " + msg.action)
    console.log("Model > " + msg.model)
@ -19,6 +22,7 @@ WorkerScript.onMessage = function(msg) {
        console.log("Not loggedin")
        return;
    }
+
    if (typeof msg.conf['loadImages'] !== "undefined")
        loadImages = msg.conf['loadImages']

@ -90,7 +94,6 @@ WorkerScript.onMessage = function(msg) {
                    }
                    addDataToModel (msg.model, "append", items);
                    items = [];
-
                } else if (data[i].hasOwnProperty("content")){
                    // console.log("Is toot... parsing...")
                    item = parseToot(data[i]);
@ -108,8 +111,6 @@ WorkerScript.onMessage = function(msg) {
    });
 }

-
-
 //WorkerScript.sendMessage({ 'notifyNewItems': length - i })
 function addDataToModel (model, mode, items) {
    var length = items.length;
@ -125,23 +126,40 @@ function addDataToModel (model, mode, items){

    model.sync()
 }
-function parseAccounts(collection, prefix, data){
-    var res = collection;

+// Get Account Data: Represents a user of Mastodon and their associated profile.
+function parseAccounts(collection, prefix, data) {
+
+    var res = collection;
+    // Base attributes
    res[prefix + 'account_id'] = data["id"]
    res[prefix + 'account_username'] = data["username"]
    res[prefix + 'account_acct'] = data["acct"]
+    res[prefix + 'account_url'] = data["url"]
+    // Display attributes
    res[prefix + 'account_display_name'] = data["display_name"]
-    res[prefix + 'account_discoverable'] = data["discoverable"]
-    res[prefix + 'account_locked'] = data["locked"]
-    res[prefix + 'account_created_at'] = data["created_at"]
+    res[prefix + 'account_note'] = data["note"]
    res[prefix + 'account_avatar'] = data["avatar"]
    res[prefix + 'account_header'] = data["header"]
+    res[prefix + 'account_locked'] = data["locked"]
+    //res[prefix + 'account_emojis'] = data["emojis"]
+    res[prefix + 'account_discoverable'] = data["discoverable"]
+    // Statistical attributes
+    res[prefix + 'account_created_at'] = data["created_at"]
+    res[prefix + 'account_statuses_count'] = data["statuses_count"]
+    res[prefix + 'account_followers_count'] = data["followers_count"]
+    res[prefix + 'account_following_count'] = data["following_count"]
+    // Optional attributes
+    //res[prefix + 'account_fields'] = data["fields"]
+    res[prefix + 'account_bot'] = data["bot"]
+    res[prefix + 'account_group'] = data["group"]
+    res[prefix + 'account_source'] = data["source"]

    //console.log(JSON.stringify(res))
    return (res);
 }

+// Get Notification Data
 function parseNotification(data){
    //console.log(JSON.stringify(data))
    var item = {
@ -154,29 +172,28 @@ function parseNotification(data){
        if (!data.status) {
            break;
        }
-
        item = parseToot(data.status)
        item['typeIcon'] = "image://theme/icon-s-retweet"
        item['typeIcon'] = "image://theme/icon-s-alarm"
-        item['type'] = "mention";
+        item['type'] = "mention"
        break;
+
    case "reblog":
        if (!data.status) {
            break;
        }
-
        item = parseToot(data.status)
        item = parseAccounts(item, "reblog_", data["account"])
        item = parseAccounts(item, "", data["status"]["account"])
-        item['status_reblog'] = true;
-        item['type'] = "reblog";
+        item['status_reblog'] = true
+        item['type'] = "reblog"
        item['typeIcon'] = "image://theme/icon-s-retweet"
        break;
+
    case "favourite":
        if (!data.status) {
            break;
        }
-
        item = parseToot(data.status)
        item = parseAccounts(item, "reblog_", data["account"])
        item = parseAccounts(item, "", data["status"]["account"])
@ -185,15 +202,16 @@ function parseNotification(data){
        item['type'] = "favourite";
        //item['retweetScreenName'] = item['reblog_account_username'];
        break;
+
    case "follow":
        item['type'] = "follow";
        item = parseAccounts(item, "", data["account"])
        item = parseAccounts(item, "reblog_", data["account"])
        item['content'] = data['account']['note']
-        item['typeIcon'] = "../../images/icon-s-following.svg"
+        item['typeIcon'] = "../../images/icon-s-follow.svg"
        item['attachments'] = []
-
        break;
+
    default:
        item['typeIcon'] = "image://theme/icon-s-sailfish"
    }
@ -216,10 +234,13 @@ function collect() {
    }
    return ret;
 }
+
 function getDate(dateStr) {
    var ts = new Date(dateStr);
    return new Date(ts.getFullYear(), ts.getMonth(), ts.getDate(), 0, 0, 0)
 }
+
+// Get Status / Toot Data
 function parseToot (data) {
    var i = 0;
    var item = {};
@ -227,30 +248,34 @@ function parseToot (data){
    item['type'] = "toot"
    item['highlight'] = false
    item['status_id'] = data["id"]
-    item['status_uri'] = data["uri"]
-    item['status_url'] = data["url"]
-    item['status_in_reply_to_id'] = data["in_reply_to_id"]
-    item['status_in_reply_to_account_id'] = data["in_reply_to_account_id"]
-    item['status_reblog'] = data["reblog"] ? true : false
-    item['status_content'] = data["content"]
-    item['status_created_at'] = item['created_at'] = new Date(data["created_at"]);
-    item['section'] = getDate(data["created_at"]);
-    item['reblogs_count'] = data["reblogs_count"]
-    item['favourites_count'] = data["favourites_count"]
-    item['reblogged'] = data["reblogged"]
-    item['favourited'] = data["favourited"]
-    item['bookmarked'] = data["bookmarked"]
+    item['status_created_at'] = item['created_at'] = new Date(data["created_at"])
    item['status_sensitive'] = data["sensitive"]
    item['status_spoiler_text'] = data["spoiler_text"]
    item['status_visibility'] = data["visibility"]
+    item['status_language'] = data["language"]

+    item['status_uri'] = data["uri"]
+    item['status_url'] = data["url"]
+    item['status_replies_count'] = data["replies_count"]
+    item['status_reblogs_count'] = data["reblogs_count"]
+    item['status_favourites_count'] = data["favourites_count"]
+    item['status_favourited'] = data["favourited"]
+    item['status_reblogged'] = data["reblogged"]
+    item['status_bookmarked'] = data["bookmarked"]
+
+    item['status_content'] = data["content"]
+    item['status_in_reply_to_id'] = data["in_reply_to_id"]
+    item['status_in_reply_to_account_id'] = data["in_reply_to_account_id"]
+    item['status_reblog'] = data["reblog"] ? true : false
+    item['section'] = getDate(data["created_at"])
+
+    // If Toot is a Reblog
    if(item['status_reblog']) {
        item['type'] = "reblog";
        item['typeIcon'] = "image://theme/icon-s-retweet"
        item['status_id'] = data["reblog"]["id"];
        item['status_spoiler_text'] = data["reblog"]["spoiler_text"]
        item['status_sensitive'] = data["reblog"]["sensitive"]
-        item['emojis'] = data["reblog"]["emojis"];
        item = parseAccounts(item, "", data['reblog']["account"])
        item = parseAccounts(item, "reblog_", data["account"])
    } else {
@ -263,14 +288,11 @@ function parseToot (data){
    .replaceAll('class=""', '');
    item['attachments'] = [];

-
-
-
+    // Media attachements in Toots
    for(i = 0; i < data['media_attachments'].length ; i++) {
        var attachments = data['media_attachments'][i];
        item['content'] = item['content'].replaceAll(attachments['text_url'], '')
        var tmp = {
-            id: attachments['id'],
            id: attachments['id'],
            type: attachments['type'],
            url: attachments['remote_url'] && typeof attachments['remote_url'] == "string" ? attachments['remote_url'] : attachments['url'] ,
@ -278,6 +300,8 @@ function parseToot (data){
        }
        item['attachments'].push(tmp)
    }
+
+    // Media attachements in Reblogs
    if(item['status_reblog']) {
        for(i = 0; i < data['reblog']['media_attachments'].length ; i++) {
            var attachments = data['reblog']['media_attachments'][i];
@ -291,9 +315,11 @@ function parseToot (data){
            item['attachments'].push(tmp)
        }
    }
+
    return addEmojis(item, data);
 }

+// Display function for custom Emojis in Toots
 function addEmojis(item, data) {
    var emoji, i;
    for (i = 0; i < data["emojis"].length; i++) {
--- a/qml/pages/ConversationPage.qml
+++ b/qml/pages/ConversationPage.qml
@ -8,18 +8,19 @@ import "./components/"
 Page {
    id: conversationPage

-    property string headerTitle: ""
    property string type
-    property alias title: header.title
-    property alias description: header.description
-    property alias avatar: header.image
+    property string description: ""
+    property string headerTitle: ""
    property string suggestedUser: ""
    property ListModel suggestedModel
    property string toot_id: ""
    property string toot_url: ""
    property string toot_uri: ""
    property int tootMaxChar: 500;
-    property bool bot: false
+    property bool bot: false //otherwise ReferenceError ProfileHeader.qml
+    property bool followed_by: false //otherwise ReferenceError ProfileHeader.qml
+    property bool locked: false //otherwise ReferenceError ProfileHeader.qml
+    property bool group: false //otherwise ReferenceError ProfileHeader.qml
    property ListModel mdl

    allowedOrientations: Orientation.All
@ -104,10 +105,11 @@ Page {
        PullDownMenu {
            id: pulleyConversation
            visible: type === "reply"
+
            MenuItem {
+                //: Use the translation of "Copy Link" for a shorter PullDownMenu label
                text: qsTr("Copy Link to Clipboard")
                onClicked: if (toot_url === "") {
-
                               var test = toot_uri.split("/")
                               console.log(toot_uri)
                               console.log(JSON.stringify(test))
@ -117,9 +119,18 @@ Page {
                                   Clipboard.text = urialt
                               }
                               else Clipboard.text = toot_uri
-
-                           } else onClicked: Clipboard.text = toot_url
+                           } else Clipboard.text = toot_url
            }
+
+            MenuItem {
+                //: "Reply" will show the Toot text entry Panel. "Hide Reply" closes it. Alternative: Use "Close Reply"
+                text: !panel.open ? qsTr("Reply") : qsTr("Hide Reply")
+                visible: type == "reply"
+                onClicked: if (!panel.open) {
+                               panel.open = true
+                           } else panel.open = false
+            }
+
        }
    }

@ -165,10 +176,12 @@ Page {
                }
            }
            onCountChanged: {
+                if (count > 0) {
                    positionViewAtBeginning(suggestedModel.count - 1, ListView.Beginning)
                }
            }
        }
+    }

    DockedPanel {
        id: panel
@ -178,7 +191,8 @@ Page {
                + (warningContent.visible ? warningContent.height : 0)
        dock: Dock.Bottom
        open: true
-        animationDuration: 200
+
+        animationDuration: 300

        Rectangle {
            width: parent.width
@ -276,10 +290,10 @@ Page {

            opacity: 0.7
            icon {
+                source: "../../qml/images/icon-m-emoji.svg?"
                color: Theme.secondaryColor
                width: Theme.iconSizeSmallPlus
                fillMode: Image.PreserveAspectFit
-                source: "../../qml/images/icon-m-emoji.svg"
            }
            anchors {
                top: warningContent.bottom
@ -520,7 +534,7 @@ Page {
    BackgroundItem {
        id: hiddenPanel
        visible: !panel.open
-        height: Theme.paddingLarge * 0.5
+        height: Theme.paddingLarge * 0.7
        width: parent.width
        opacity: enabled ? 0.6 : 0.0
        Behavior on opacity { FadeAnimator { duration: 400 } }
@ -577,5 +591,4 @@ Page {
    InfoBanner {
        id: sentBanner
    }
-
 }
--- a/qml/pages/LoginPage.qml
+++ b/qml/pages/LoginPage.qml
@ -161,5 +161,4 @@ Page {
            }
        }
    }
-
 }
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@ -10,7 +10,6 @@ Page {
    property bool isFirstPage: true
    property bool isTablet: true //Screen.sizeCategory >= Screen.Large

-    // The effective value will be restricted by ApplicationWindow.allowedOrientations
    allowedOrientations: Orientation.All

    DockedPanel {
@ -19,6 +18,7 @@ Page {
        width: mainPage.isPortrait ? parent.width : Theme.itemSizeLarge
        height: mainPage.isPortrait ? Theme.itemSizeLarge : parent.height
        dock: mainPage.isPortrait ? Dock.Bottom : Dock.Right
+
        Navigation {
            id: navigation
            isPortrait: !mainPage.isPortrait
@ -31,6 +31,7 @@ Page {

    VisualItemModel {
        id: visualModel
+
        MyList{
            id: tlHome
            title: qsTr("Home")
@ -88,7 +89,7 @@ Page {
                    loader.sourceComponent = userListComponent
                } else if (search.charAt(0) === "#") {
                    loader.sourceComponent = tagListComponent
-                } else { loader.sourceComponent = wordListComponent}
+                } else loader.sourceComponent = wordListComponent
            }

            Loader {
@ -102,6 +103,7 @@ Page {
                PageHeader {
                    title: qsTr("Search")
                }
+
                SearchField {
                    id: searchField
                    width: parent.width
@ -175,10 +177,19 @@ Page {
                                               "username": model.account_acct,
                                               "user_id": model.account_id,
                                               "profileImage": model.account_avatar,
-                                               "profileBackground": model.account_header
+                                               "profileBackground": model.account_header,
+                                               "note": model.account_note,
+                                               "url": model.account_url,
+                                               "followers_count": model.account_followers_count,
+                                               "following_count": model.account_following_count,
+                                               "statuses_count": model.account_statuses_count,
+                                               "locked": model.account_locked,
+                                               "bot": model.account_bot,
+                                               "group": model.account_group
                                           })
                        }
                    }
+
                    Component.onCompleted: {
                        view2.type = "accounts/search"
                        view2.params = []
@ -279,5 +290,4 @@ Page {
    Component.onCompleted: {
        console.log("aaa")
    }
-
 }
--- a/qml/pages/ProfilePage.qml
+++ b/qml/pages/ProfilePage.qml
@ -19,14 +19,12 @@ Page {
    property int statuses_count
    property int following_count
    property int followers_count
-    property int favourites_count
-    property int reblogs_count
-    property int count_moments
    property bool locked: false
    property bool bot: false
+    property bool group: false
    property bool following: false
-    property bool requested: false
    property bool followed_by: false
+    property bool requested: false
    property bool blocking: false
    property bool muting: false
    property bool domain_blocking: false
@ -71,16 +69,9 @@ Page {
            case 'following_count':
                following_count = messageObject.data
                break;
-            case 'acct':
-                // line below was commented out, reason unknown
-                // username = messageObject.data
-                break;
-            case 'locked':
-                locked = messageObject.data
-                break;
-            case 'bot':
-                bot = messageObject.data
-                break;
+            /* case 'acct':
+                username = messageObject.data
+                break; */
            case 'created_at':
                created_at = messageObject.data
                break;
@ -102,10 +93,7 @@ Page {
                break;
            case 'blocking':
                blocking = messageObject.data
-                followers_count = followers_count + (blocking ? -1 : 0)
-                break;
-            case 'followed_by':
-                followed_by = messageObject.data
+                // followers_count = followers_count + (blocking ? -1 : 0)
                break;
            }
        }
@ -123,11 +111,7 @@ Page {
                'conf'      : Logic.conf
            }
            worker.sendMessage(msg)
-            msg = {
-                'action'    : "accounts/"+user_id,
-                'conf'      : Logic.conf
-            }
-            worker.sendMessage(msg)
+
        } else {
            var instance = Logic.conf['instance'].split("//")
            msg = {
@ -160,13 +144,10 @@ Page {
        }
    }

-    ExpandingSectionGroup {  // ProfilePage ExpandingSection
+    // ProfilePage ExpandingSection
+    ExpandingSectionGroup {
        id: profileExpander
-        anchors {
-            bottom: parent.bottom
-            left: parent.left
-            right: parent.right
-        }
+        anchors.bottom: parent.bottom

        ExpandingSection {
            id: expandingSection1
@ -174,13 +155,12 @@ Page {
                //: If there's no good translation for "About", use "Details" (in details about profile).
                qsTr("About")
            content.sourceComponent: Column {
-                height: Math.min( txtContainer, parent.height * 0.7 )
                spacing: Theme.paddingLarge

                Item {
                    id: txtContainer
                    width: parent.width
-                    height: Math.min( txtNote.height, parent.height * 0.55 )
+                    height: profilePage.isPortrait ? Math.min( txtNote.height, parent.height * 0.5 ) :  Math.min( txtNote.height, parent.height * 0.2 )
                    visible: {
                        if ((note.text === "") || ( note.text === "<p></p>" )) {
                            false
@ -249,7 +229,7 @@ Page {

                    Text {
                        id: txtFollowers
-                        visible: followers_count ? true : false
+                        visible: true //followers_count ? true : false
                        text: followers_count+" "+
                              //: Will show as: "35 Followers"
                              qsTr("Followers")
@ -260,7 +240,7 @@ Page {

                    Text {
                        id: txtFollowing
-                        visible: following_count ? true : false
+                        visible: true //following_count ? true : false
                        text: following_count+" "+
                              //: Will show as: "23 Following"
                              qsTr("Following")
@ -271,7 +251,7 @@ Page {

                    Text {
                        id: txtStatuses
-                        visible: statuses_count ? true : false
+                        visible: true //statuses_count ? true : false
                        text: statuses_count+" "+
                              //: Will show as: "115 Statuses"
                              qsTr("Statuses")
@ -279,17 +259,6 @@ Page {
                        color: Theme.highlightColor
                        wrapMode: Text.Wrap
                    }
-
-                    /*Text {
-                        id: txtFavourites
-                        visible: favourites_count ? true : false
-                        text: favourites_count+" "+
-                            //: Will show as: "56 Favourites"
-                            qsTr("Favourites")
-                        font.pixelSize: Theme.fontSizeExtraSmall
-                        color: Theme.highlightColor
-                        wrapMode: Text.Wrap
-                    } */
                }

                Item {  // dummy item for spacing
@ -301,7 +270,7 @@ Page {
                    Button {
                        id: btnMention
                        preferredWidth: Theme.buttonWidthSmall
-                        text: "Mention"
+                        text: qsTr("Mention")
                        onClicked: {
                            pageStack.push(Qt.resolvedUrl("ConversationPage.qml"), {
                                               headerTitle: qsTr("Mention"),
@ -393,5 +362,4 @@ Page {
            }
        }
    }
-
 }
--- a/qml/pages/SettingsPage.qml
+++ b/qml/pages/SettingsPage.qml
@ -31,7 +31,6 @@ Page {
                text: qsTr("Load Images in Toots")
                description: qsTr("Disable this option if you want to preserve your data connection")
                icon.source: "image://theme/icon-m-image"
-                enabled: true
                checked: typeof Logic.conf['loadImages'] !== "undefined" && Logic.conf['loadImages']
                onClicked: {
                    Logic.conf['loadImages'] = checked
@ -97,11 +96,8 @@ Page {
                        font.pixelSize: Theme.fontSizeExtraSmall
                        wrapMode: Text.Wrap
                        color: Theme.highlightColor
-                        anchors {
-                            left: parent.left
-                            right: parent.right
-                            rightMargin: Theme.paddingLarge + icnRemoveAccount
-                        }
+                        width: parent.width - Theme.paddingMedium
+                        anchors.left: parent.left
                    }
                }
            }
@ -253,5 +249,4 @@ Page {
            }
        }
    }
-
 }
--- a/qml/pages/components/EmojiSelect.qml
+++ b/qml/pages/components/EmojiSelect.qml
@ -161,6 +161,4 @@ Component {
            VerticalScrollDecorator {flickable: listEmojis }
        }
    }
-
-
 }
--- a/qml/pages/components/InfoBanner.qml
+++ b/qml/pages/components/InfoBanner.qml
@ -55,5 +55,4 @@ DockedPanel {
            stop()
        }
    }
-
 }
--- a/qml/pages/components/ItemUser.qml
+++ b/qml/pages/components/ItemUser.qml
@ -18,6 +18,7 @@ BackgroundItem {
        anchors.left: parent.left
        anchors.leftMargin: Theme.horizontalPageMargin
        color: Theme.highlightDimmerColor
+
        Image {
            id: img
            opacity: status === Image.Ready ? 1.0 : 0.0
@ -30,7 +31,7 @@ BackgroundItem {
            size: BusyIndicatorSize.Small
            opacity: img.status === Image.Ready ? 0.0 : 1.0
            Behavior on opacity { FadeAnimator {} }
-            running: avatar.status !== Image.Ready;
+            running: avatar.status !== Image.Ready
            anchors.centerIn: parent
        }

@ -41,36 +42,70 @@ BackgroundItem {
                                          "username": model.account_acct,
                                          "user_id": model.account_id,
                                          "profileImage": model.account_avatar,
-                                          "profileBackground": model.account_header
+                                          "profileBackground": model.account_header,
+                                          "note": model.account_note,
+                                          "url": model.account_url,
+                                          "followers_count": model.account_followers_count,
+                                          "following_count": model.account_following_count,
+                                          "statuses_count": model.account_statuses_count,
+                                          "locked": model.account_locked,
+                                          "bot": model.account_bot
                                      })
        }
    }

-    Column {
+    Item {
        anchors.left: avatar.right
        anchors.leftMargin: Theme.paddingLarge
        anchors.verticalCenter: parent.verticalCenter
        height: account_acct.height + display_name.height
+
        Label {
            id: display_name
-            text: model.account_display_name+" "
+            text: account_display_name ? account_display_name : account_username.split('@')[0]
            color: !pressed ? Theme.primaryColor : Theme.highlightColor
            font.pixelSize: Theme.fontSizeSmall
+            anchors.top: parent.top
+
        }
+
+        Image {
+            id: icnBot
+            visible: account_bot
+            source: "../../images/icon-s-bot.svg?" + ( pressed ? Theme.highlightColor : Theme.primaryColor )
+            width: account_bot ? Theme.iconSizeExtraSmall : 0
+            height: width
+            y: Theme.paddingLarge
+            anchors {
+                left: display_name.right
+                leftMargin: Theme.paddingSmall
+                verticalCenter: display_name.verticalCenter
+            }
+        }
+
        Label {
            id: account_acct
            text: "@"+model.account_acct
            color: !pressed ?  Theme.secondaryColor : Theme.secondaryHighlightColor
            anchors.leftMargin: Theme.paddingMedium
            font.pixelSize: Theme.fontSizeExtraSmall
+            anchors.top: display_name.bottom
        }
    }
+
    onClicked: openUser( {
                            "display_name": model.account_display_name,
                            "username": model.account_acct,
                            "user_id": model.account_id,
                            "profileImage": model.account_avatar,
-                            "profileBackground": model.account_header
+                            "profileBackground": model.account_header,
+                            "note": model.account_note,
+                            "url": model.account_url,
+                            "followers_count": model.account_followers_count,
+                            "following_count": model.account_following_count,
+                            "statuses_count": model.account_statuses_count,
+                            "locked": model.account_locked,
+                            "bot": model.account_bot,
+                            "group": model.account_group
                        } )
-
 }
--- a/qml/pages/components/MediaBlock.qml
+++ b/qml/pages/components/MediaBlock.qml
@ -23,15 +23,17 @@ Item {
        if (model && model.count)
            count = model.count
        switch(count){
+
        case 1:
            placeholder1.width = holder.width
            placeholder1.height = placeholder1.width*hRatio
            placeholder1.visible = true;
            holder.height = placeholder1.height
            break;
+
        case 2:
-            placeholder1.visible = true;
-            placeholder2.visible = true;
+            placeholder1.visible = true
+            placeholder2.visible = true
            placeholder1.width = (holder.width-Theme.paddingSmall)/2
            placeholder1.height = placeholder1.width
            placeholder2.width = placeholder1.width
@ -39,11 +41,12 @@ Item {
            placeholder2.x = placeholder1.width + placeholder2.x + Theme.paddingSmall
            holder.height = placeholder1.height
            break;
+
        case 3:
-            placeholder1.visible = true;
-            placeholder2.visible = true;
-            placeholder3.visible = true;
-            placeholder4.visible = false;
+            placeholder1.visible = true
+            placeholder2.visible = true
+            placeholder3.visible = true
+            placeholder4.visible = false

            placeholder1.width = holder.width - Theme.paddingSmall - Theme.itemSizeLarge;
            placeholder1.height = Theme.itemSizeLarge*2+Theme.paddingSmall
@ -53,23 +56,23 @@ Item {
            placeholder3.height = placeholder3.width = placeholder2.height = placeholder2.width
            placeholder3.x = placeholder2.x = placeholder1.x + placeholder1.width + Theme.paddingSmall;
            placeholder3.y = placeholder2.y + placeholder2.height + Theme.paddingSmall;
-
            break;
+
        case 4:
-            placeholder1.visible = true;
-            placeholder2.visible = true;
-            placeholder3.visible = true;
-            placeholder4.visible = true;
+            placeholder1.visible = true
+            placeholder2.visible = true
+            placeholder3.visible = true
+            placeholder4.visible = true

            placeholder1.width = placeholder2.width = placeholder3.width = placeholder4.width =  (holder.width - 3*Theme.paddingSmall)/4
            placeholder1.height = placeholder2.height = placeholder3.height = placeholder4.height = Theme.itemSizeLarge*2+Theme.paddingSmall
-            placeholder2.x = 1*(placeholder1.width)+ 1*Theme.paddingSmall;
-            placeholder3.x = 2*(placeholder1.width)+ 2*Theme.paddingSmall;
-            placeholder4.x = 3*(placeholder1.width)+ 3*Theme.paddingSmall;
-
+            placeholder2.x = 1*(placeholder1.width)+ 1*Theme.paddingSmall
+            placeholder3.x = 2*(placeholder1.width)+ 2*Theme.paddingSmall
+            placeholder4.x = 3*(placeholder1.width)+ 3*Theme.paddingSmall

            holder.height = placeholder1.height            
            break;
+
        default:
            holder.height = 0
            placeholder1.visible = placeholder2.visible = placeholder3.visible = placeholder4.visible = false;
@ -86,7 +89,7 @@ Item {
                type = model.get(0).type
                previewURL = model.get(0).preview_url
                mediaURL = model.get(0).url
-                height = 200
+                height = Theme.itemSizeLarge
                return true
            } else {
                height = 0
@ -105,7 +108,7 @@ Item {
                type = model.get(1).type
                previewURL = model.get(1).preview_url
                mediaURL = model.get(1).url
-                height = 200
+                height = Theme.itemSizeLarge
                return true
            } else {
                height = 0
@ -124,7 +127,7 @@ Item {
                type = model.get(2).type
                previewURL = model.get(2).preview_url
                mediaURL = model.get(2).url
-                height = 200
+                height = Theme.itemSizeLarge
                return true
            } else {
                height = 0
@ -143,7 +146,7 @@ Item {
                type = model.get(3).type
                previewURL = model.get(3).preview_url
                mediaURL = model.get(3).url
-                height = 200
+                height = Theme.itemSizeLarge
                return true
            } else {
                height = 0
@ -151,5 +154,4 @@ Item {
            }
        }
    }
-
 }
--- a/qml/pages/components/MediaFullScreen.qml
+++ b/qml/pages/components/MediaFullScreen.qml
@ -84,7 +84,7 @@ FullscreenContentPage {
                }
            }
            onStopped: function() {
-                if (video.duration < 30000)
+                if (type != 'video')
                    video.play()
                else
                    video.stop()
@ -151,7 +151,6 @@ FullscreenContentPage {
                    anchors.centerIn: parent
                }
            }
-
        }
    }

@ -288,7 +287,7 @@ FullscreenContentPage {
        id: failedLoading
        Text {
            text: qsTr("Error loading")
-            font.pixelSize: Theme.fontSizeSmall;
+            font.pixelSize: Theme.fontSizeSmall
            color: Theme.highlightColor
        }
    }
@ -315,11 +314,10 @@ FullscreenContentPage {
        }
        icon.source: "image://theme/icon-m-cloud-download"
        onClicked: {
-            var filename = mediaURL.split("/");
-            FileDownloader.downloadFile(mediaURL, filename[filename.length-1]);
+            var filename = mediaURL.split("/")
+            FileDownloader.downloadFile(mediaURL, filename[filename.length-1])
        }
    }

    VerticalScrollDecorator { flickable: imageFlickable }
 }
-
--- a/qml/pages/components/MiniHeader.qml
+++ b/qml/pages/components/MiniHeader.qml
@ -9,11 +9,7 @@ Item {

    Label {
        id: lblName
-        text:
-            if (account_display_name === "") {
-                account_username.split('@')[0]
-            }
-            else account_display_name
+        text: account_display_name ? account_display_name : account_username.split('@')[0]
        font.weight: Font.Bold
        font.pixelSize: Theme.fontSizeSmall
        color: if ( myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
@ -21,18 +17,15 @@ Item {
               } else ( pressed ? Theme.highlightColor : ( !highlight ? Theme.primaryColor : Theme.secondaryColor ))
        truncationMode: TruncationMode.Fade
        width: contentWidth > parent.width /2 ? parent.width /2 : contentWidth
-        anchors {
-            left: parent.left
-            leftMargin: Theme.paddingMedium
-        }
+        anchors.left: parent.left
    }

-    Image {
-        id: icnLocked
-        visible: account_locked
-        opacity: 0.8
-        source: "image://theme/icon-s-secure?" + (pressed ? Theme.highlightColor : Theme.primaryColor)
-        width: account_locked ? Theme.iconSizeExtraSmall*0.8 : 0
+    Icon {
+        id: icnBot
+        visible: account_bot
+        source: "../../images/icon-s-bot.svg?" + ( pressed ? Theme.highlightColor : Theme.primaryColor )
+        color: Theme.primaryColor
+        width: account_bot ? Theme.iconSizeExtraSmall * 1.3 : 0
        height: width
        y: Theme.paddingLarge
        anchors {
@ -44,15 +37,30 @@ Item {

    Label {
        id: lblScreenName
+        visible: model.type !== "follow"
        text: '@'+account_username
        font.pixelSize: Theme.fontSizeExtraSmall
        color: ( pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor )
        truncationMode: TruncationMode.Fade
        anchors {
-            left: icnLocked.right
+            left: icnBot ? icnBot.right : icnLocked.right
+            leftMargin: Theme.paddingSmall
            right: lblDate.left
-            leftMargin: Theme.paddingMedium
-            baseline: lblName.baseline
+            rightMargin: Theme.paddingMedium
+            verticalCenter: lblName.verticalCenter
+        }
+    }
+
+    Label {
+        id: lblScreenNameFollow
+        visible: model.type === "follow" && myList.type === "notifications"
+        text: '@'+account_username
+        font.pixelSize: Theme.fontSizeExtraSmall
+        color: ( pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor )
+        truncationMode: TruncationMode.Fade
+        anchors {
+            left: parent.left
+            top: lblName.bottom
        }
    }

@ -60,13 +68,11 @@ Item {
        id: lblDate
        text: Format.formatDate(created_at, new Date() - created_at < 60*60*1000 ? Formatter.DurationElapsedShort : Formatter.TimeValueTwentyFourHours)
        font.pixelSize: Theme.fontSizeExtraSmall
-        color: (pressed ? Theme.highlightColor : Theme.primaryColor)
+        color: ( pressed ? Theme.highlightColor : Theme.secondaryColor )
        horizontalAlignment: Text.AlignRight
        anchors {
            right: parent.right
-            rightMargin: Theme.horizontalPageMargin
-            baseline: lblName.baseline
+            verticalCenter: lblName.verticalCenter
        }
    }
-
 }
--- a/qml/pages/components/MiniStatus.qml
+++ b/qml/pages/components/MiniStatus.qml
@ -26,13 +26,8 @@ Item {
    Label {
        id: lblRtByName
        visible: type.length
-        anchors {
-            left: icon.right
-            leftMargin: Theme.paddingMedium
-            verticalCenter: icon.verticalCenter
-        }
        text: {
-            var action = "";
+            var action = ""
            switch(type){
            case "reblog":
                action =  qsTr('boosted');
@ -47,9 +42,14 @@ Item {
                miniStatus.visible = false
                action = type;
            }
-            return typeof reblog_account_username !== "undefined" ? '@' + reblog_account_username + ' ' +  action : ''
+            return typeof reblog_account_username !== "undefined" ? "@" + reblog_account_username + " " +  action : " "
        }
        font.pixelSize: Theme.fontSizeExtraSmall
        color: Theme.highlightColor
+        anchors {
+            left: icon.right
+            leftMargin: Theme.paddingMedium
+            verticalCenter: icon.verticalCenter
+        }
    }
 }
--- a/qml/pages/components/MyImage.qml
+++ b/qml/pages/components/MyImage.qml
@ -89,5 +89,4 @@ Item {
            }
        }
    }
-
 }
--- a/qml/pages/components/MyList.qml
+++ b/qml/pages/components/MyList.qml
@ -70,7 +70,7 @@ SilicaListView {
            text: qsTr("New Toot")
            onClicked: {
                pageStack.push(Qt.resolvedUrl("../ConversationPage.qml"), {
-                                   //headerTitle: "New Toot",
+                                   headerTitle: qsTr("New Toot"),
                                   type: "new"
                               })
            }
@ -84,8 +84,7 @@ SilicaListView {
        }
    }

-    delegate: VisualContainer {
-    } //Toot {}
+    delegate: VisualContainer { }

    add: Transition {
        NumberAnimation { property: "opacity"; from: 0; to: 1.0; duration: 800 }
@ -186,5 +185,4 @@ SilicaListView {
        if (type !== "")
            worker.sendMessage(msg)
    }
-
 }
--- a/qml/pages/components/Navigation.qml
+++ b/qml/pages/components/Navigation.qml
@ -169,6 +169,4 @@ SilicaGridView {
    }

    VerticalScrollDecorator {}
-
-
 }
--- a/qml/pages/components/ProfileHeader.qml
+++ b/qml/pages/components/ProfileHeader.qml
@ -12,9 +12,7 @@ Item {
    property string bg: ""

    width: parent.width
-    height: if (bot === true) {
-                avatarImage.height + Theme.paddingLarge*2 + infoLbl.height + Theme.paddingLarge
-            } else avatarImage.height + Theme.paddingLarge*2
+    height: avatarImage.height + Theme.paddingLarge*3 + infoLbl.height

    Rectangle {
        id: bgImage
@ -29,7 +27,6 @@ Item {
            asynchronous: true
            fillMode: Image.PreserveAspectCrop
            source: bg
-            opacity: 0.8
            anchors.fill: parent
        }
    }
@ -37,19 +34,18 @@ Item {
    Image {
        id: avatarImage
        asynchronous: true
-        source:
-            if (avatarImage.status === Image.Error)
+        source: if (avatarImage.status === Image.Error)
                    source = "../../images/icon-l-profile.svg?" + (pressed
                                                                   ? Theme.highlightColor
                                                                   : Theme.primaryColor)
                else image
-        width: description === "" ? Theme.iconSizeMedium : Theme.iconSizeLarge
+        width: Theme.iconSizeLarge
        height: width
        anchors {
            left: parent.left
-            leftMargin: Theme.paddingLarge
+            leftMargin: Theme.horizontalPageMargin
            top: parent.top
-            topMargin: Theme.paddingLarge
+            topMargin: Theme.paddingLarge * 1.5
        }

        Button {
@ -74,18 +70,15 @@ Item {
            top: parent.top
            topMargin: Theme.paddingLarge
            left: avatarImage.right
-            leftMargin: Theme.paddingLarge
+            leftMargin: Theme.horizontalPageMargin
            right: parent.right
-            rightMargin: Theme.paddingLarge
+            rightMargin: Theme.horizontalPageMargin
            verticalCenter: parent.verticalCenter
        }

        Label {
            id: profileTitle
-            text: if (title === "") {
-                      description.split('@')[0]
-                  }
-                  else title
+            text: title ? title : description.split('@')[0]
            font.pixelSize: Theme.fontSizeLarge
            font.family: Theme.fontFamilyHeading
            color: Theme.highlightColor
@ -112,19 +105,37 @@ Item {
        id: infoLbl
        spacing: Theme.paddingLarge
        layoutDirection: Qt.RightToLeft
-        height: Theme.iconSizeSmall + Theme.paddingSmall
+        height: followed_by || locked || bot || group ? Theme.iconSizeSmall + Theme.paddingSmall : 0
        anchors {
            top: avatarImage.bottom
-            topMargin: Theme.paddingLarge
+            topMargin: Theme.paddingMedium
            left: parent.left
-            leftMargin: Theme.paddingLarge
+            leftMargin: Theme.horizontalPageMargin
            right: parent.right
-            rightMargin: Theme.paddingLarge
+            rightMargin: Theme.horizontalPageMargin
        }

-        /* Rectangle {
+        Rectangle {
+            id: groupBg
+            visible: (group ? true : false)
+            radius: Theme.paddingSmall
+            color: Theme.secondaryHighlightColor
+            width: groupLbl.width + 2*Theme.paddingLarge
+            height: parent.height
+
+            Label {
+                id: groupLbl
+                text: qsTr("Group")
+                font.pixelSize: Theme.fontSizeExtraSmall
+                color: Theme.primaryColor
+                anchors.horizontalCenter: parent.horizontalCenter
+                anchors.verticalCenter: parent.verticalCenter
+            }
+        }
+
+        Rectangle {
            id: followingBg
-            visible: (following ? true : false)
+            visible: (followed_by ? true : false)
            radius: Theme.paddingSmall
            color: Theme.secondaryHighlightColor
            width: followingLbl.width + 2*Theme.paddingLarge
@ -138,7 +149,26 @@ Item {
                anchors.horizontalCenter: parent.horizontalCenter
                anchors.verticalCenter: parent.verticalCenter
            }
-        } */
+        }
+
+        Rectangle {
+            id: lockedBg
+            visible: (locked ? true : false)
+            radius: Theme.paddingSmall
+            color: Theme.secondaryHighlightColor
+            width: lockedImg.width + 2*Theme.paddingLarge
+            height: parent.height
+
+            HighlightImage {
+                id: lockedImg
+                source: "image://theme/icon-s-secure?"
+                width: Theme.fontSizeExtraSmall
+                height: width
+                color: Theme.primaryColor
+                anchors.horizontalCenter: lockedBg.horizontalCenter
+                anchors.verticalCenter: lockedBg.verticalCenter
+            }
+        }

        Rectangle {
            id: botBg
--- a/qml/pages/components/ProfileImage.qml
+++ b/qml/pages/components/ProfileImage.qml
@ -24,5 +24,4 @@ FullscreenContentPage {
        }
        onClicked: pageStack.pop()
    }
-
 }
--- a/qml/pages/components/Toot.qml
+++ b/qml/pages/components/Toot.qml
@ -1,187 +0,0 @@
-import QtQuick 2.0
-import Sailfish.Silica 1.0
-import QtGraphicalEffects 1.0
-
-
-BackgroundItem {
-    id: delegate
-
-    signal send (string notice)
-    signal navigateTo(string link)
-
-    width: parent.width
-    height: lblText.paintedHeight + (lblText.text.length > 0 ? Theme.paddingLarge : 0 )+ lblName.paintedHeight + (type.length ? Theme.paddingLarge + iconRT.height : 0) + Theme.paddingLarge
-
-    Image {
-        id: iconRT
-        y: Theme.paddingLarge
-        anchors.right: avatar.right
-        visible: type.length
-        width: Theme.iconSizeExtraSmall
-        height: width
-        source: "../../images/boosted.svg"
-    }
-
-    Label {
-        id: lblRtByName
-        visible: type.length
-        anchors.left: lblName.left
-        anchors.bottom: iconRT.bottom
-        font.pixelSize: Theme.fontSizeExtraSmall
-        color: Theme.secondaryColor
-        text: {
-            var action;
-            switch(type){
-            case "reblog":
-                action =  qsTr('boosted');
-                break;
-            case "favourite":
-                action =  qsTr('favourited');
-                break;
-            case "follow":
-                action =  qsTr('followed you');
-                break;
-            default:
-                action = type;
-            }
-            return '@' + retweetScreenName + ' ' +  action
-        }
-    }
-
-    Image {
-        id: avatar
-        x: Theme.horizontalPageMargin
-        y: Theme.paddingLarge + (type.length ? iconRT.height+Theme.paddingMedium : 0)
-        asynchronous: true
-        width: Theme.iconSizeMedium
-        height: width
-        smooth: true
-        source: account_avatar
-        visible: true
-        MouseArea {
-            anchors.fill: parent
-            onClicked: {
-                pageStack.push(Qt.resolvedUrl("../ProfilePage.qml"), {
-                                   "display_name": account_display_name,
-                                   "username": account_username,
-                                   "profileImage": account_avatar
-                               })
-            }
-        }
-    }
-
-    Label {
-        id: lblName
-        text: account_display_name
-        font.weight: Font.Bold
-        font.pixelSize: Theme.fontSizeSmall
-        color: (pressed ? Theme.highlightColor : Theme.primaryColor)
-        anchors {
-            top: avatar.top
-            topMargin: 0
-            left: avatar.right
-            leftMargin: Theme.paddingMedium
-        }
-    }
-
-    Image {
-        id: iconLocked
-        visible: account_locked
-        y: Theme.paddingLarge
-        opacity: 0.8
-        source: "image://theme/icon-s-secure?" + (pressed
-                                                  ? Theme.highlightColor
-                                                  : Theme.primaryColor)
-        width: account_locked ? Theme.iconSizeExtraSmall*0.8 : 0
-        height: width
-        anchors {
-            left: lblName.right
-            leftMargin: Theme.paddingSmall
-            verticalCenter: lblName.verticalCenter
-        }
-    }
-
-    Label {
-        id: lblScreenName
-        truncationMode: TruncationMode.Fade
-        text: '@'+account_username
-        font.pixelSize: Theme.fontSizeExtraSmall
-        color: (pressed ? Theme.secondaryHighlightColor : Theme.secondaryColor)
-        anchors {
-            left: iconLocked.right
-            right: lblDate.left
-            leftMargin: Theme.paddingMedium
-            baseline: lblName.baseline
-        }
-    }
-
-    Label {
-        id: lblDate
-        function timestamp() {
-            var txt = Format.formatDate(created_at, Formatter.Timepoint)
-            var elapsed = Format.formatDate(created_at, Formatter.DurationElapsedShort)
-            return (elapsed ? elapsed  : txt )
-        }
-        text: Format.formatDate(created_at, new Date() - created_at < 60*60*1000 ? Formatter.DurationElapsedShort : Formatter.TimeValueTwentyFourHours)
-        font.pixelSize: Theme.fontSizeExtraSmall
-        color: (pressed ? Theme.highlightColor : Theme.primaryColor)
-        horizontalAlignment: Text.AlignRight
-        anchors {
-            right: parent.right
-            baseline: lblName.baseline
-            rightMargin: Theme.paddingLarge
-        }
-    }
-
-    Text {
-        id: lblText
-        height: content.length ? paintedHeight : 0
-        onLinkActivated: {
-            console.log(link)
-            if (link[0] === "@") {
-                pageStack.push(Qt.resolvedUrl("../Profile.qml"), {
-                                   "name": "",
-                                   "username": link.substring(1),
-                                   "profileImage": ""
-                               })
-            } else if (link[0] === "#") {
-                pageStack.pop(pageStack.find(function(page) {
-                    var check = page.isFirstPage === true;
-                    if (check)
-                        page.onLinkActivated(link)
-                    return check;
-                }));
-                send(link)
-            } else {
-                Qt.openUrlExternally(link);
-            }
-        }
-        text: content
-        textFormat: Text.RichText
-        font.pixelSize: Theme.fontSizeSmall
-        color: (pressed ? Theme.highlightColor : Theme.primaryColor)
-        linkColor : Theme.highlightColor
-        wrapMode: Text.Wrap
-        maximumLineCount: 6
-        anchors {
-            left: lblName.left
-            right: parent.right
-            top: lblScreenName.bottom
-            topMargin: Theme.paddingSmall
-            rightMargin: Theme.paddingLarge
-        }
-    }
-
-    onClicked: {
-        pageStack.push(Qt.resolvedUrl("../ConversationPage.qml"), {
-                           headerTitle: "Conversation",
-                           toot_id: id,
-                           toot_url: status_url,
-                           //title: account_display_name,
-                           description: '@'+account_acc,
-                           avatar: account_avatar,
-                           type: "reply"
-                       })
-    }
-
-}
--- a/qml/pages/components/VisualContainer.qml
+++ b/qml/pages/components/VisualContainer.qml
@ -14,6 +14,7 @@ BackgroundItem {
                mnu.height + miniHeader.height + Theme.paddingLarge + lblContent.height + Theme.paddingLarge + (miniStatus.visible ? miniStatus.height : 0)
            } else mnu.height + miniHeader.height + (typeof attachments !== "undefined" && attachments.count ? media.height + Theme.paddingLarge + Theme.paddingMedium: Theme.paddingLarge) + lblContent.height + Theme.paddingLarge + (miniStatus.visible ? miniStatus.height : 0) + (iconDirectMsg.visible ? iconDirectMsg.height : 0)

+    // Background for Direct Messages in Notification View
    Rectangle {
        id: bgDirect
        x: 0
@ -28,7 +29,8 @@ BackgroundItem {
        }
    }

-    Rectangle {
+    // Background for reblogs and favourited statuses in Notification View
+    /* Rectangle {
        id: bgNotifications
        x: 0
        y: 0
@ -40,9 +42,9 @@ BackgroundItem {
            GradientStop { position: -0.5; color: "transparent" }
            GradientStop { position: 0.4; color: Theme.highlightDimmerColor }
        }
-    }
+    } */

-    MiniStatus {
+    MiniStatus { // Element showing reblog- or favourite status on top of Toot
        id: miniStatus
        anchors {
            leftMargin: Theme.horizontalPageMargin
@ -52,6 +54,7 @@ BackgroundItem {
        }
    }

+    // Account avatar
    Image {
        id: avatar
        visible: true
@ -83,7 +86,15 @@ BackgroundItem {
                                   "username": model.account_acct,
                                   "user_id": model.account_id,
                                   "profileImage": model.account_avatar,
-                                   "profileBackground": model.account_header
+                                   "profileBackground": model.account_header,
+                                   "note": model.account_note,
+                                   "url": model.account_url,
+                                   "followers_count": model.account_followers_count,
+                                   "following_count": model.account_following_count,
+                                   "statuses_count": model.account_statuses_count,
+                                   "locked": model.account_locked,
+                                   "bot": model.account_bot,
+                                   "group": model.account_group
                               } )
            }
        }
@ -113,7 +124,7 @@ BackgroundItem {
            visible: status_visibility === "direct"
            width: Theme.iconSizeMedium
            height: width
-            source: "image://theme/icon-m-mail"
+            source: "../../images/icon-m-mail.svg?"
            anchors {
                horizontalCenter: avatar.horizontalCenter
                top: avatar.bottom
@ -146,39 +157,68 @@ BackgroundItem {
                width: Theme.iconSizeSmall
                height: width
            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    pageStack.push(Qt.resolvedUrl("../ProfilePage.qml"), {
+                                       "display_name": model.reblog_account_display_name,
+                                       "username": model.reblog_account_acct,
+                                       "user_id": model.reblog_account_id,
+                                       "profileImage": model.reblog_account_avatar,
+                                       "profileBackground": model.account_header,
+                                       "note": model.reblog_account_note,
+                                       "url": model.reblog_account_url,
+                                       "followers_count": model.reblog_account_followers_count,
+                                       "following_count": model.reblog_account_following_count,
+                                       "statuses_count": model.reblog_account_statuses_count,
+                                       "locked": model.reblog_account_locked,
+                                       "bot": model.reblog_account_bot,
+                                       "group": model.reblog_account_group
+                                   } )
+                }
+            }
        }
    }

+    // Display name, username, date of Toot
    MiniHeader {
        id: miniHeader
        anchors {
            top: avatar.top
            left: avatar.right
+            leftMargin: Theme.paddingMedium
            right: parent.right
+            rightMargin: Theme.horizontalPageMargin
        }
    }

-    Text  {
+    // Toot content
+    Label  {
        id: lblContent
+
        visible: model.type !== "follow"
-        text: content.replace(new RegExp("<a ", 'g'), '<a style="text-decoration: none; color:'+(pressed ?  Theme.secondaryColor : Theme.highlightColor)+'" ')
-        textFormat: Text.RichText
+        text: if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
+                  content
+              } else content.replace(new RegExp("<a ", 'g'), '<a style="text-decoration: none; color:'+(pressed ?  Theme.secondaryColor : Theme.highlightColor)+'" ')
+        textFormat: myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" ) ? Text.StyledText : Text.RichText
        font.pixelSize: Theme.fontSizeSmall
-        linkColor: if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
-                       Theme.secondaryHighlightColor
-                   } else Theme.highlightColor
        wrapMode: Text.Wrap
+        truncationMode: TruncationMode.Elide
        color: if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
                   (pressed ? Theme.secondaryHighlightColor : (!highlight ? Theme.secondaryColor : Theme.secondaryHighlightColor))
               } else (pressed ? Theme.highlightColor : (!highlight ? Theme.primaryColor : Theme.secondaryColor))
+        linkColor: if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
+                       Theme.secondaryHighlightColor
+                   } else Theme.highlightColor
        height: if (model.type === "follow") {
                    Theme.paddingLarge
+                } else if (myList.type === "notifications" && ( model.type === "favourite" || model.type === "reblog" )) {
+                    Math.min( implicitHeight, Theme.itemSizeExtraLarge * 1.5 )
                } else content.length ? ( contentWarningLabel.paintedHeight > paintedHeight ? contentWarningLabel.paintedHeight : paintedHeight ) : 0
        anchors {
            left: miniHeader.left
-            leftMargin: Theme.paddingMedium
            right: miniHeader.right
-            rightMargin: Theme.horizontalPageMargin
            top: miniHeader.bottom
            topMargin: Theme.paddingSmall
            bottomMargin: Theme.paddingLarge
@ -210,8 +250,9 @@ BackgroundItem {
            }
        }

+        // Content warning cover for Toots
        Rectangle {
-            radius: 2
+            id: contentWarningBg
            color: Theme.highlightDimmerColor
            visible: status_spoiler_text.length > 0
            anchors.fill: parent
@ -244,22 +285,24 @@ BackgroundItem {
        }
    }

+    // Displays media in Toots
    MediaBlock {
        id: media
        visible: if (myList.type === "notifications" && ( type === "favourite" || type === "reblog" )) {
                     false
                 } else true
-        model: typeof attachments !== "undefined" ? attachments : Qt.createQmlObject('import QtQuick 2.0; ListModel {   }', Qt.application, 'InternalQmlObject');
+        model: typeof attachments !== "undefined" ? attachments : Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject')
        height: Theme.iconSizeExtraLarge * 2
        anchors {
-            left: lblContent.left
-            right: lblContent.right
+            left: miniHeader.left
+            right: miniHeader.right
            top: lblContent.bottom
-            topMargin: Theme.paddingSmall
+            topMargin: Theme.paddingMedium
            bottomMargin: Theme.paddingLarge
        }
    }

+    // Context menu for Toots
    ContextMenu {
        id: mnu

@ -277,11 +320,11 @@ BackgroundItem {
                                       "bgAction": true,
                                       "action" : "statuses/"+model.status_id+"/" + (status ? "unreblog" : "reblog")
                                   })
-                model.reblogs_count = !status ? model.reblogs_count+1 : (model.reblogs_count > 0 ? model.reblogs_count-1 : model.reblogs_count);
+                model.status_reblogs_count = !status ? model.status_reblogs_count+1 : (model.status_reblogs_count > 0 ? model.status_reblogs_count-1 : model.status_reblogs_count);
                model.reblogged = !model.reblogged
            }

-            Image {
+            Icon {
                id: icRT
                source: "image://theme/icon-s-retweet?" + (!model.reblogged ? Theme.highlightColor : Theme.primaryColor)
                width: Theme.iconSizeExtraSmall
@ -294,7 +337,7 @@ BackgroundItem {
            }

            Label {
-                text: reblogs_count
+                text: status_reblogs_count // from API.js
                font.pixelSize: Theme.fontSizeExtraSmall
                color: !model.reblogged ? Theme.highlightColor : Theme.primaryColor
                anchors {
@ -308,9 +351,9 @@ BackgroundItem {
        MenuItem {
            id: mnuFavourite
            visible: model.type !== "follow"
-            text: typeof model.favourited !== "undefined" && model.favourited ? qsTr("Unfavorite") : qsTr("Favorite")
+            text: typeof model.status_favourited !== "undefined" && model.status_favourited ? qsTr("Unfavorite") : qsTr("Favorite")
            onClicked: {
-                var status = typeof model.favourited !== "undefined" && model.favourited
+                var status = typeof model.status_favourited !== "undefined" && model.status_favourited
                worker.sendMessage({
                                       "conf"   : Logic.conf,
                                       "params" : [],
@ -318,26 +361,26 @@ BackgroundItem {
                                       "bgAction": true,
                                       "action" : "statuses/"+model.status_id+"/" + (status ? "unfavourite" : "favourite")
                                   })
-                model.favourites_count = !status ? model.favourites_count+1 : (model.favourites_count > 0 ? model.favourites_count-1 : model.favourites_count);
-                model.favourited = !model.favourited
+                model.status_favourites_count = !status ? model.status_favourites_count+1 : (model.status_favourites_count > 0 ? model.status_favourites_count-1 : model.status_favourites_count);
+                model.status_favourited = !model.status_favourited
            }

-            Image {
+            Icon {
                id: icFA
+                source: "image://theme/icon-s-favorite?" + (!model.status_favourited ? Theme.highlightColor : Theme.primaryColor)
+                width: Theme.iconSizeExtraSmall
+                height: width
                anchors {
                    leftMargin: Theme.horizontalPageMargin
                    left: parent.left
                    verticalCenter: parent.verticalCenter
                }
-                width: Theme.iconSizeExtraSmall
-                height: width
-                source: "image://theme/icon-s-favorite?" + (!model.favourited ? Theme.highlightColor : Theme.primaryColor)
            }

            Label {
-                text: favourites_count
+                text: status_favourites_count
                font.pixelSize: Theme.fontSizeExtraSmall
-                color: !model.favourited ? Theme.highlightColor : Theme.primaryColor
+                color: !model.status_favourited ? Theme.highlightColor : Theme.primaryColor
                anchors {
                    left: icFA.right
                    leftMargin: Theme.paddingMedium
@ -346,54 +389,83 @@ BackgroundItem {
            }
        }

+        MenuItem {
+            id: mnuBookmark
+            visible: model.type !== "follow"
+            text: typeof model.status_bookmarked !== "undefined" && model.status_bookmarked ? qsTr("Remove Bookmark") : qsTr("Bookmark")
+            onClicked: {
+                var status = typeof model.status_bookmarked !== "undefined" && model.status_bookmarked
+                worker.sendMessage({
+                                       "conf"   : Logic.conf,
+                                       "params" : [],
+                                       "method" : "POST",
+                                       "bgAction": true,
+                                       "action" : "statuses/"+model.status_id+"/" + (status ? "unbookmark" : "bookmark")
+                                   })
+                model.status_bookmarked = !model.status_bookmarked
+            }
+
+            Icon {
+                source: "../../images/icon-s-bookmark.svg?"
+                color: !model.status_bookmarked ? Theme.highlightColor : Theme.primaryColor
+                width: Theme.iconSizeExtraSmall
+                height: width
+                anchors {
+                    left: parent.left
+                    leftMargin: Theme.horizontalPageMargin + Theme.paddingMedium
+                    verticalCenter: parent.verticalCenter
+                }
+            }
+        }
+
+
        MenuItem {
            id: mnuMention
            visible: model.type === "follow"
            text: qsTr("Mention")
            onClicked: {
                pageStack.push(Qt.resolvedUrl("../ConversationPage.qml"), {
-                                   headerTitle: "Mention",
+                                   headerTitle: qsTr("Mention"),
                                   description: "@"+reblog_account_acct,
                                   type: "new"
                               })
            }

-            Image {
+            Icon {
                id: icMT
+                source: "image://theme/icon-s-chat?" + (!model.status_favourited ? Theme.highlightColor : Theme.primaryColor)
+                width: Theme.iconSizeExtraSmall
+                height: width
                anchors {
-                    leftMargin: Theme.horizontalPageMargin
+                    leftMargin: Theme.horizontalPageMargin + Theme.paddingMedium
                    left: parent.left
                    verticalCenter: parent.verticalCenter
                }
-                width: Theme.iconSizeExtraSmall
-                height: width
-                source: "image://theme/icon-s-chat?" + (!model.favourited ? Theme.highlightColor : Theme.primaryColor)
            }
        }
    }

+    // Open ConversationPage and show other Toots in thread (if available)
    onClicked: {
        var m = Qt.createQmlObject('import QtQuick 2.0; ListModel { }', Qt.application, 'InternalQmlObject');
        if (typeof mdl !== "undefined")
            m.append(mdl.get(index))
        pageStack.push(Qt.resolvedUrl("../ConversationPage.qml"), {
-                           headerTitle: "Conversation",
-                           toot_id: status_id,
-                           toot_url: status_url,
-                           toot_uri: status_uri,
-                           title: account_display_name,
-                           description: '@'+account_acct,
-                           avatar: account_avatar,
+                           headerTitle: qsTr("Conversation"),
+                           "toot_id": status_id,
+                           "toot_url": status_url,
+                           "toot_uri": status_uri,
+                           "description": '@'+account_acct,
                           mdl: m,
                           type: "reply"
                       })
    }
    onPressAndHold: {
        console.log(JSON.stringify(mdl.get(index)))
-        mnu.show(delegate)
+        mnu.open(delegate)
    }
+
    onDoubleClicked: {
        console.log("double click")
    }
-
 }
--- a/src/imageuploader.cpp
+++ b/src/imageuploader.cpp
@ -11,15 +11,15 @@
 //static const QUrl IMGUR_UPLOAD_URL("https://httpbin.org/post");
 //static const QUrl IMGUR_UPLOAD_URL();

-ImageUploader::ImageUploader(QObject *parent) : QObject(parent), m_networkAccessManager(0), m_reply(0) {
+ImageUploader::ImageUploader(QObject *parent) : QObject(parent), m_networkAccessManager(nullptr), m_reply(nullptr) {
    m_networkAccessManager = new QNetworkAccessManager(this);
 }

 ImageUploader::~ImageUploader() {
-    if (m_reply != 0) {
+    if (m_reply != nullptr) {
        m_reply->disconnect();
        m_reply->deleteLater();
-        m_reply = 0;
+        m_reply = nullptr;
    }
 }

@ -58,10 +58,10 @@ void ImageUploader::upload() {
        return;
    }

-    if (m_reply != 0) {
+    if (m_reply != nullptr) {
        m_reply->disconnect();
        m_reply->deleteLater();
-        m_reply = 0;
+        m_reply = nullptr;
    }

    /*QFileInfo fileInfo(QUrl(m_fileName).toLocalFile());
@ -146,6 +146,6 @@ void ImageUploader::replyFinished() {
    }

    m_reply->deleteLater();
-    m_reply = 0;
+    m_reply = nullptr;
    postdata.clear();
 }
--- a/translations/harbour-tooterb-de.ts
+++ b/translations/harbour-tooterb-de.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation>Link kopieren</translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation>Toot gesendet!</translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Antworten</translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation>Antwort verbergen</translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation>Folgt dir</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Gruppe</translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>um bei den Übersetzungen mitzuhelfen.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>hat geteilt</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>hat favorisiert</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>folgt dir</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation>Erwähnen</translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation>Konversation</translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation>Lesezeichen entfernen</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Lesezeichen</translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-el.ts
+++ b/translations/harbour-tooterb-el.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>για να βοηθήσετε την μετάφραση της εφαρμογής στην γλώσσα σας.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>προωθημένο</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>στους σελιδοδείκτες</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>σας ακολουθούν</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-es.ts
+++ b/translations/harbour-tooterb-es.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation>Copiar enlace al portapapeles</translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation>¡Toot enviado!</translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Respuesta</translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation>Cerrar respuesta</translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation>Te sigue</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Grupo</translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -220,7 +238,7 @@
    <message>
        <source>Requested</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>Requerido</translation>
    </message>
    <message>
        <source>Follow</source>
@ -253,7 +271,7 @@
    </message>
    <message>
        <source>Mention</source>
-        <translation type="unfinished"></translation>
+        <translation>Mencionar</translation>
    </message>
 </context>
 <context>
@ -344,21 +362,6 @@
        <translation>para ayudar con traducciones.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>retooteó</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>marcó como favorito</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>te empezó a seguir</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -379,7 +382,19 @@
    </message>
    <message>
        <source>Mention</source>
-        <translation type="unfinished"></translation>
+        <translation>Mencionar</translation>
+    </message>
+    <message>
+        <source>Conversation</source>
+        <translation>Conversación</translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation>Eliminar marcador</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Marcador</translation>
    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-fr.ts
+++ b/translations/harbour-tooterb-fr.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation>Copier le lien</translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation>Pouet envoyé !</translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Répondre</translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation>Fermer Répondre</translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation>Vous suit</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Groupe</translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>pour aider à traduire cette application.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>a partagé</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>a ajouté à ses favoris</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>vous suit</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation>Mentionner</translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation>Conversation</translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation>Retirer marque-page</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Ajouter aux marque-pages</translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-it.ts
+++ b/translations/harbour-tooterb-it.ts
@ -4,23 +4,23 @@
 <context>
    <name>API</name>
    <message>
-        <location filename="../qml/lib/API.js" line="156"/>
+        <location filename="../qml/lib/API.js" line="158"/>
        <source>favourited</source>
        <translation>ha apprezzato</translation>
    </message>
    <message>
-        <location filename="../qml/lib/API.js" line="167"/>
+        <location filename="../qml/lib/API.js" line="169"/>
        <source>followed you</source>
        <translation>ha iniziato a seguirti</translation>
    </message>
    <message>
-        <location filename="../qml/lib/API.js" line="177"/>
+        <location filename="../qml/lib/API.js" line="179"/>
        <source>boosted</source>
        <translation>ha condiviso</translation>
    </message>
    <message>
-        <location filename="../qml/lib/API.js" line="187"/>
        <location filename="../qml/lib/API.js" line="189"/>
+        <location filename="../qml/lib/API.js" line="191"/>
        <source>said</source>
        <translation>ha detto</translation>
    </message>
@ -28,47 +28,59 @@
 <context>
    <name>ConversationPage</name>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="108"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="111"/>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation>Copia link</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="220"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="127"/>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Risposta</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ConversationPage.qml" line="127"/>
+        <source>Hide Reply</source>
+        <translation>Chiudere Risposta</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/ConversationPage.qml" line="234"/>
        <source>Write your warning here</source>
        <translation>Contenuto avviso</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="253"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="267"/>
        <source>What&apos;s on your mind?</source>
        <translation>A cosa stai pensando?</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="320"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="334"/>
        <source>Delete</source>
        <translation>Elimina</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="418"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="432"/>
        <source>Public</source>
        <translation>Pubblico</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="421"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="435"/>s
        <source>Unlisted</source>
        <translation>Non elencato</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="424"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="438"/>s
        <source>Followers-only</source>
        <translation>Solo ai seguaci</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="427"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="441"/>
        <source>Direct</source>
        <translation>Diretto</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ConversationPage.qml" line="474"/>
+        <location filename="../qml/pages/ConversationPage.qml" line="488"/>
        <source>Toot sent!</source>
        <translation>Toot è stato pubblicato!</translation>
    </message>
@ -133,37 +145,37 @@
 <context>
    <name>MainPage</name>
    <message>
-        <location filename="../qml/pages/MainPage.qml" line="36"/>
+        <location filename="../qml/pages/MainPage.qml" line="37"/>
        <source>Home</source>
        <translation>Home</translation>
    </message>
    <message>
-        <location filename="../qml/pages/MainPage.qml" line="46"/>
+        <location filename="../qml/pages/MainPage.qml" line="47"/>
        <source>Notifications</source>
        <translation>Notifiche</translation>
    </message>
    <message>
-        <location filename="../qml/pages/MainPage.qml" line="57"/>
+        <location filename="../qml/pages/MainPage.qml" line="58"/>
        <source>Local</source>
        <translation>Locale</translation>
    </message>
    <message>
-        <location filename="../qml/pages/MainPage.qml" line="68"/>
+        <location filename="../qml/pages/MainPage.qml" line="69"/>
        <source>Federated</source>
        <translation>Federazione</translation>
    </message>
    <message>
-        <location filename="../qml/pages/MainPage.qml" line="103"/>
+        <location filename="../qml/pages/MainPage.qml" line="104"/>
        <source>Search</source>
        <translation>Cerca</translation>
    </message>
    <message>
-        <location filename="../qml/pages/MainPage.qml" line="108"/>
+        <location filename="../qml/pages/MainPage.qml" line="110"/>
        <source>@user or #term</source>
        <translation>@utente o #termine</translation>
    </message>
    <message>
-        <location filename="../qml/pages/MainPage.qml" line="253"/>
+        <location filename="../qml/pages/MainPage.qml" line="264"/>
        <source>New Toot</source>
        <translation>Nuovo toot</translation>
    </message>
@ -171,7 +183,7 @@
 <context>
    <name>MediaFullScreen</name>
    <message>
-        <location filename="../qml/pages/components/MediaFullScreen.qml" line="290"/>
+        <location filename="../qml/pages/components/MediaFullScreen.qml" line="289"/>
        <source>Error loading</source>
        <translation>Errore durante caricamento</translation>
    </message>
@ -179,17 +191,17 @@
 <context>
    <name>MiniStatus</name>
    <message>
-        <location filename="../qml/pages/components/MiniStatus.qml" line="38"/>
+        <location filename="../qml/pages/components/MiniStatus.qml" line="33"/>
        <source>boosted</source>
        <translation>ha condiviso</translation>
    </message>
    <message>
-        <location filename="../qml/pages/components/MiniStatus.qml" line="41"/>
+        <location filename="../qml/pages/components/MiniStatus.qml" line="36"/>
        <source>favourited</source>
        <translation>ha apprezzato</translation>
    </message>
    <message>
-        <location filename="../qml/pages/components/MiniStatus.qml" line="44"/>
+        <location filename="../qml/pages/components/MiniStatus.qml" line="39"/>
        <source>followed you</source>
        <translation>ha iniziato a seguirti</translation>
    </message>
@ -213,6 +225,7 @@
    </message>
    <message>
        <location filename="../qml/pages/components/MyList.qml" line="70"/>
+        <location filename="../qml/pages/components/MyList.qml" line="73"/>
        <source>New Toot</source>
        <translation>Nuovo toot</translation>
    </message>
@ -225,7 +238,17 @@
 <context>
    <name>ProfileHeader</name>
    <message>
-        <location filename="../qml/pages/components/ProfileHeader.qml" line="153"/>
+        <location filename="../qml/pages/components/ProfileHeader.qml" line="128"/>
+        <source>Group</source>
+        <translation>Gruppo</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/ProfileHeader.qml" line="146"/>
+        <source>Follows you</source>
+        <translation>Ti segue</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/ProfileHeader.qml" line="183"/>
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
@ -233,78 +256,79 @@
 <context>
    <name>ProfilePage</name>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="175"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="156"/>
        <source>About</source>
        <extracomment>If there&apos;s no good translation for &quot;About&quot;, use &quot;Details&quot; (in details about profile).</extracomment>
        <translation>Dettagli</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="255"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="235"/>
        <source>Followers</source>
        <extracomment>Will show as: &quot;35 Followers&quot;</extracomment>
        <translation>Seguaci</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="266"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="246"/>
        <source>Following</source>
        <extracomment>Will show as: &quot;23 Following&quot;</extracomment>
        <translation>Segue</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="277"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="257"/>
        <source>Statuses</source>
        <extracomment>Will show as: &quot;115 Statuses&quot;</extracomment>
        <translation>Toots</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="307"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="273"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="276"/>
        <source>Mention</source>
        <translation>Menzionare</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="319"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="288"/>
        <source>Unfollow</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
        <translation>Smetti di seguire</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="321"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="290"/>
        <source>Requested</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
        <translation>Richiesto</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="323"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="292"/>
        <source>Follow</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
        <translation>Segui</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="342"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="311"/>
        <source>Unmute</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
        <translation>Non silenziare</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="344"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="313"/>
        <source>Mute</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
        <translation>Silenzia</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="362"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="331"/>
        <source>Unblock</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
        <translation>Sblocca</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="364"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="333"/>
        <source>Block</source>
        <extracomment>Is a button. Keep it as short as possible.</extracomment>
        <translation>Blocca</translation>
    </message>
    <message>
-        <location filename="../qml/pages/ProfilePage.qml" line="380"/>
+        <location filename="../qml/pages/ProfilePage.qml" line="349"/>
        <source>Open in Browser</source>
        <translation>Aprire nel browser</translation>
    </message>
@ -332,136 +356,134 @@
        <translation>Disabilitare questa opzione per conservare connessione dati</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="41"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="40"/>
        <source>Account</source>
        <translation>Account</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="73"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="72"/>
        <source>Remove Account</source>
        <translation>Rimozione del account</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="73"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="72"/>
        <source>Add Account</source>
        <translation>Aggiungi account</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="96"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="95"/>
        <source>Deauthorize this app from using your account and remove account data from phone</source>
        <translation>Annullare l&apos;autorizzazione dell&apos;app e rimuovere l&apos;account</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="96"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="95"/>
        <source>Authorize this app to access your Mastodon account</source>
        <translation>Autorizzare l&apos;app all&apos;utilizzo del conto Mastodon</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="110"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="106"/>
        <source>Translate</source>
        <translation>Tradurre</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="116"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="112"/>
        <source>Use</source>
        <extracomment>Full sentence for translation: &quot;Use Transifex to help with app translation to your language.&quot; - The word Transifex is a link and doesn&apos;t need translation.</extracomment>
        <translation>Utilizzare</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="116"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="112"/>
        <source>to help with app translation to your language.</source>
        <translation>per aiutare nella traduzione dell&apos;app.</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="132"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="128"/>
        <source>Credits</source>
        <translation>Sviluppo</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="148"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="144"/>
        <source>UI/UX design and development</source>
        <translation>Design UI/UX e sviluppo</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="155"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="151"/>
        <source>Visual identity</source>
        <translation>Identità visiva</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="162"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="158"/>
        <source>Development and translations</source>
        <translation>Sviluppo e traduzioni</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="169"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="165"/>
        <source>Occitan &amp; French translation</source>
        <translation>Traduzione francese e occitanica</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="176"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="172"/>
        <source>Chinese translation</source>
        <translation>Traduzione cinese</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="183"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="179"/>
        <source>Dutch translation</source>
        <translation>Traduzione olandese</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="190"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="186"/>
        <source>Spanish translation</source>
        <translation>Traduzione spagnola</translation>
    </message>
    <message>
-        <location filename="../qml/pages/SettingsPage.qml" line="197"/>
+        <location filename="../qml/pages/SettingsPage.qml" line="193"/>
        <source>Added README file</source>
        <translation>Aggiunto file README</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <location filename="../qml/pages/components/Toot.qml" line="36"/>
-        <source>boosted</source>
-        <translation>ha condiviso</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/components/Toot.qml" line="39"/>
-        <source>favourited</source>
-        <translation>ha apprezzato</translation>
-    </message>
-    <message>
-        <location filename="../qml/pages/components/Toot.qml" line="42"/>
-        <source>followed you</source>
-        <translation>ha iniziato a seguirti</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="270"/>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="312"/>
        <source>Unboost</source>
        <translation>Annulla condivisione</translation>
    </message>
    <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="270"/>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="312"/>
        <source>Boost</source>
        <translation>Condividi</translation>
    </message>
    <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="311"/>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="353"/>
        <source>Unfavorite</source>
        <translation>Annulla apprezzamento</translation>
    </message>
    <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="311"/>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="353"/>
        <source>Favorite</source>
        <translation>Apprezzato</translation>
    </message>
    <message>
-        <location filename="../qml/pages/components/VisualContainer.qml" line="352"/>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="394"/>
+        <source>Remove Bookmark</source>
+        <translation>Elimina segnalibro</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="394"/>
+        <source>Bookmark</source>
+        <translation>Aggiungi segnalibro</translation>
+    </message>
+    <message>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="424"/>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="427"/>
        <source>Mention</source>
        <translation>Menzionare</translation>
    </message>
+    <message>
+        <location filename="../qml/pages/components/VisualContainer.qml" line="453"/>
+        <source>Conversation</source>
+        <translation>Conversazione</translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-nl.ts
+++ b/translations/harbour-tooterb-nl.ts
@ -24,15 +24,16 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation>Linkadres kopiëren</translation>
    </message>
    <message>
        <source>Write your warning here</source>
-        <translation type="unfinished"></translation>
+        <translation>Waarschuwingstekst</translation>
    </message>
    <message>
        <source>What&apos;s on your mind?</source>
-        <translation type="unfinished"></translation>
+        <translation>Wat wil je kwijt?</translation>
    </message>
    <message>
        <source>Delete</source>
@ -40,23 +41,32 @@
    </message>
    <message>
        <source>Public</source>
-        <translation type="unfinished"></translation>
+        <translation>Openbaar</translation>
    </message>
    <message>
        <source>Unlisted</source>
-        <translation type="unfinished"></translation>
+        <translation>Minder openbaar</translation>
    </message>
    <message>
        <source>Followers-only</source>
-        <translation type="unfinished"></translation>
+        <translation>Alleen volgers</translation>
    </message>
    <message>
        <source>Direct</source>
-        <translation type="unfinished"></translation>
+        <translation>Direct</translation>
    </message>
    <message>
        <source>Toot sent!</source>
-        <translation type="unfinished"></translation>
+        <translation>Toot verzonden!</translation>
+    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Antwoord</translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation>Antwoord verbergen</translation>
    </message>
 </context>
 <context>
@ -96,7 +106,7 @@
    </message>
    <message>
        <source>Enter a valid Mastodon instance URL</source>
-        <translation type="unfinished"></translation>
+        <translation>Geldig Mastodon URL</translation>
    </message>
    <message>
        <source>Mastodon is a free, open-source social network. A decentralized alternative to commercial platforms, it avoids the risks of a single company monopolizing your communication. Pick a server that you trust — whichever you choose, you can interact with everyone else. Anyone can run their own Mastodon instance and participate in the social network seamlessly.</source>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation>Volgt jou</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Groep</translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -253,7 +271,7 @@
    </message>
    <message>
        <source>Mention</source>
-        <translation type="unfinished">Vermelden</translation>
+        <translation>Vermelden</translation>
    </message>
 </context>
 <context>
@ -344,21 +362,6 @@
        <translation>om deze app te helpen vertalen in jouw taal.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>boostte</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>maakte favoriet</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>volgde jou</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation>Vermelden</translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation>Conversatie</translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation>Bookmarken</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Bladwijzer verwijderen</translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-nl_BE.ts
+++ b/translations/harbour-tooterb-nl_BE.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>voor te helpen met dezen app in uw taal te vertalen.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>heeft geboost</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>heeft geduimd voor</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>volgt u nu</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-oc.ts
+++ b/translations/harbour-tooterb-oc.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>per ajudar a traduire l’aplicacion dins vòstra lenga.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>a tornat partejar</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>a mes en favorit</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>vos sèc</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-pl.ts
+++ b/translations/harbour-tooterb-pl.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>podbił(a)</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>dodał(a) do ulubionych</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>zaczął(-ęła Cię śledzić)</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-ru.ts
+++ b/translations/harbour-tooterb-ru.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>чтобы помочь с переводом приложения на ваш язык.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>росту</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>имеет любимый</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>следую за тобой</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-sr.ts
+++ b/translations/harbour-tooterb-sr.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>и помозите у преводу апликације на други језик.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>разглашено</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>омиљено</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>вас прати</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-sv.ts
+++ b/translations/harbour-tooterb-sv.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation type="unfinished"></translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>för att hjälpa med app-översättningar till ditt språk.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>puffade</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>favoriserad</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>följer dig</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb-zh_CN.ts
+++ b/translations/harbour-tooterb-zh_CN.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation>复制链接到剪切板</translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation>已发送嘟嘟！</translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation type="unfinished"></translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>推起</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>收藏</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>关注你</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
--- a/translations/harbour-tooterb.ts
+++ b/translations/harbour-tooterb.ts
@ -24,6 +24,7 @@
    <name>ConversationPage</name>
    <message>
        <source>Copy Link to Clipboard</source>
+        <extracomment>Use the translation of &quot;Copy Link&quot; for a shorter PullDownMenu label</extracomment>
        <translation>Copy Link to Clipboard</translation>
    </message>
    <message>
@ -58,6 +59,15 @@
        <source>Toot sent!</source>
        <translation>Toot sent!</translation>
    </message>
+    <message>
+        <source>Reply</source>
+        <extracomment>&quot;Reply&quot; will show the Toot text entry Panel. &quot;Hide Reply&quot; closes it. Alternative: Use &quot;Close Reply&quot;</extracomment>
+        <translation>Reply</translation>
+    </message>
+    <message>
+        <source>Hide Reply</source>
+        <translation>Hide Reply</translation>
+    </message>
 </context>
 <context>
    <name>CoverPage</name>
@ -189,6 +199,14 @@
        <source>Bot</source>
        <translation>Bot</translation>
    </message>
+    <message>
+        <source>Follows you</source>
+        <translation>Follows you</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Group</translation>
+    </message>
 </context>
 <context>
    <name>ProfilePage</name>
@ -344,21 +362,6 @@
        <translation>to help with app translation to your language.</translation>
    </message>
 </context>
-<context>
-    <name>Toot</name>
-    <message>
-        <source>boosted</source>
-        <translation>boosted</translation>
-    </message>
-    <message>
-        <source>favourited</source>
-        <translation>favourited</translation>
-    </message>
-    <message>
-        <source>followed you</source>
-        <translation>followed you</translation>
-    </message>
-</context>
 <context>
    <name>VisualContainer</name>
    <message>
@ -381,5 +384,17 @@
        <source>Mention</source>
        <translation>Mention</translation>
    </message>
+    <message>
+        <source>Conversation</source>
+        <translation>Conversation</translation>
+    </message>
+    <message>
+        <source>Remove Bookmark</source>
+        <translation>Remove Bookmark</translation>
+    </message>
+    <message>
+        <source>Bookmark</source>
+        <translation>Bookmark</translation>
+    </message>
 </context>
 </TS>