diff --git a/qml/Setting.qml b/qml/Setting.qml
index 2859cca..84454b2 100644
--- a/qml/Setting.qml
+++ b/qml/Setting.qml
@@ -1,5 +1,39 @@
 import QtQuick 2.9
+import QtQuick.Controls 2.2
+import QtQuick.Controls.Material 2.2
 
-Item {
+Page {
+    SwipeView {
+        id: settingView
 
+        currentIndex: 1
+        anchors.fill: parent
+
+        Item {
+            id: accountPage
+        }
+        Item {
+            id: secondPage
+        }
+        Item {
+            id: thirdPage
+        }
+    }
+
+
+    header: TabBar {
+        id: tabBar
+        width: parent.width
+        currentIndex: settingView.currentIndex
+
+        TabButton {
+            text: qsTr("Account")
+        }
+        TabButton {
+            text: qsTr("Call History")
+        }
+        TabButton {
+            text: qsTr("Dail Pad")
+        }
+    }
 }
diff --git a/qml/component/DownloadableContent.qml b/qml/component/DownloadableContent.qml
index aced0ec..d4163c3 100644
--- a/qml/component/DownloadableContent.qml
+++ b/qml/component/DownloadableContent.qml
@@ -1,6 +1,7 @@
 import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
+import QtQuick.Dialogs 1.2
 
 Item {
     property bool openOnFinished: false
@@ -14,9 +15,22 @@ Item {
         opacity: 0.4
     }
 
+    FileDialog {
+        id: locationDialog
+        title: "Please choose a location"
+        folder: shortcuts.home
+        selectFolder: true
+
+        onAccepted: currentRoom.downloadFile(eventId, folder + "/" + currentRoom.fileNameToDownload(eventId))
+
+    }
+
     onDownloadedChanged: {
-        if (downloaded && openOnFinished)
-            openSavedFile()
+        if (downloaded && openOnFinished) openSavedFile()
+    }
+
+    function saveFileAs() {
+        locationDialog.open()
     }
 
     function downloadAndOpen()
diff --git a/qml/component/FileBubble.qml b/qml/component/FileBubble.qml
index 1b8cf1d..fee665f 100644
--- a/qml/component/FileBubble.qml
+++ b/qml/component/FileBubble.qml
@@ -16,7 +16,7 @@ AvatarContainer {
             highlighted: !sentByMe
             flat: true
 
-            onClicked: downloadable.downloadAndOpen()
+            onClicked: downloadable.saveFileAs()
         }
     }
 }
diff --git a/qml/component/ImageBubble.qml b/qml/component/ImageBubble.qml
index 23cf527..bf6eefd 100644
--- a/qml/component/ImageBubble.qml
+++ b/qml/component/ImageBubble.qml
@@ -26,11 +26,12 @@ AvatarContainer {
                     anchors.fill: parent
 
                     hoverEnabled: true
+                    acceptedButtons: Qt.LeftButton | Qt.RightButton
                     propagateComposedEvents: true
                     ToolTip.visible: containsMouse
                     ToolTip.text: content.body
 
-                    onClicked: downloadable.downloadAndOpen()
+                    onClicked: mouse.button & Qt.LeftButton ? downloadable.downloadAndOpen() : downloadable.saveFileAs()
                 }
             }
         }
diff --git a/qml/component/MessageDelegate.qml b/qml/component/MessageDelegate.qml
index 77e6faa..1ea11b5 100644
--- a/qml/component/MessageDelegate.qml
+++ b/qml/component/MessageDelegate.qml
@@ -10,7 +10,7 @@ Item {
     width: delegateLoader.width
     height: delegateLoader.height
 
-    anchors.right: (eventType === "message" || eventType === "image" || eventType === "file" || eventType === "video" || eventType === "audio" || eventType === "notice") && sentByMe ? parent.right : undefined
+    anchors.right: !(eventType === "state" || eventType === "emote") && sentByMe ? parent.right : undefined
     anchors.horizontalCenter: (eventType === "state" || eventType === "emote") ? parent.horizontalCenter : undefined
 
     MouseArea {