diff --git a/src/components/Composer/Composer.vue b/src/components/Composer/Composer.vue
index 055f2d8c..a1ee329f 100644
--- a/src/components/Composer/Composer.vue
+++ b/src/components/Composer/Composer.vue
@@ -109,17 +109,6 @@
 				<VisibilitySelect :visibility.sync="visibility" />
 				<div class="emptySpace" />
 				<SubmitStatusButton :visibility="visibility" :disabled="!canPost || loading" @click="createPost" />
-
-				<!-- <NcButton :value="currentVisibilityPostLabel"
-					:disabled="!canPost"
-					native-type="submit"
-					type="primary"
-					@click.prevent="createPost">
-					<template #icon>
-						<Send title="" :size="22" decorative />
-					</template>
-					{{ postTo }}
-				</NcButton> -->
 			</div>
 		</form>
 	</div>
@@ -172,10 +161,21 @@ export default {
 		FocusOnCreate,
 	},
 	mixins: [CurrentUserMixin],
+	props: {
+		/** @type {import('vue').PropType<import('../types/Mastodon.js').Status|null>} */
+		initialMention: {
+			type: Object,
+			default: null,
+		},
+		defaultVisibility: {
+			type: String,
+			default: localStorage.getItem('social.lastPostType') || 'followers',
+		},
+	},
 	data() {
 		return {
 			statusContent: '',
-			visibility: localStorage.getItem('social.lastPostType') || 'followers',
+			visibility: this.defaultVisibility,
 			loading: false,
 			/** @type {Object<string, LocalAttachment>} */
 			attachments: {},
@@ -197,8 +197,13 @@ export default {
 								+ '</div>'
 						},
 						selectTemplate(item) {
-							return '<span class="mention" contenteditable="false">'
-								+ '<a href="' + item.original.url + '" target="_blank"><img src="' + item.original.avatar + '" />@' + item.original.value + '</a></span>'
+							return `
+								<span class="mention" contenteditable="false">
+									<a href="${item.original.url}" target="_blank">
+										<img src="${item.original.avatar}"/>
+										@${item.original.value}
+									</a>
+								</span>`
 						},
 						values: debounce(async (text, populate) => {
 							if (text.length < 1) {
@@ -281,6 +286,17 @@ export default {
 			this.replyTo = data
 			this.visibility = data.visibility
 		})
+
+		if (this.initialMention !== null) {
+			this.$refs.composerInput.innerHTML = `
+				<span class="mention" contenteditable="false">
+					<a href="${this.initialMention.url}" target="_blank">
+						<img src="${!this.initialMention.acct.includes('@') ? generateUrl(`/avatar/${this.initialMention.username}/32`) : generateUrl(`apps/social/api/v1/global/actor/avatar?id=${this.initialMention.acct}`)}"/>
+						@${this.initialMention.acct}
+					</a>
+				</span>&nbsp;`
+			this.updateStatusContent()
+		}
 	},
 	methods: {
 		updateStatusContent() {
@@ -402,7 +418,6 @@ export default {
 		},
 	},
 }
-
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/Profile.vue b/src/views/Profile.vue
index fd3a162e..f0fae400 100644
--- a/src/views/Profile.vue
+++ b/src/views/Profile.vue
@@ -23,6 +23,9 @@
 <template>
 	<div :class="{'icon-loading': !accountLoaded}" class="social__wrapper">
 		<ProfileInfo v-if="accountLoaded && accountInfo" :uid="uid" />
+
+		<Composer v-if="accountInfo" :initial-mention="accountInfo.acct === currentAccount.acct ? null : accountInfo" default-visibility="direct" />
+
 		<!-- TODO: we have no details, timeline and follower list for non-local accounts for now -->
 		<router-view v-if="accountLoaded && accountInfo && isLocal" name="details" />
 		<NcEmptyContent v-if="accountLoaded && !accountInfo"
@@ -38,17 +41,19 @@
 </template>
 
 <script>
-import ProfileInfo from './../components/ProfileInfo.vue'
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import { generateFilePath } from '@nextcloud/router'
+import ProfileInfo from './../components/ProfileInfo.vue'
+import Composer from './../components/Composer/Composer.vue'
 import accountMixins from '../mixins/accountMixins.js'
 import serverData from '../mixins/serverData.js'
-import { generateFilePath } from '@nextcloud/router'
 
 export default {
 	name: 'Profile',
 	components: {
 		NcEmptyContent,
 		ProfileInfo,
+		Composer,
 	},
 	mixins: [
 		accountMixins,
@@ -70,6 +75,10 @@ export default {
 		emptyContentImage() {
 			return generateFilePath('social', 'img', 'undraw/profile.svg')
 		},
+		/** @return {import('../types/Mastodon.js').Account} */
+		currentAccount() {
+			return this.$store.getters.currentAccount
+		},
 	},
 	// Start fetching account information before mounting the component
 	async beforeMount() {