diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessageForm/NewMessageForm.vue
index d61141bd3c4..5a9ff462af2 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessageForm/NewMessageForm.vue
@@ -80,6 +80,7 @@
 					<div v-if="messageToBeReplied" class="new-message-form__quote">
 						<Quote
 							:is-new-message-form-quote="true"
+							:parent-id="messageToBeReplied.id"
 							v-bind="messageToBeReplied" />
 					</div>
 
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index b0a62242263..9e952484ce8 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -27,6 +27,7 @@ components.
 <template>
 	<a href="#"
 		class="quote"
+		:class="{'quote-own-message': isOwnMessageQuoted}"
 		@click.prevent="handleQuoteClick">
 		<div class="quote__main">
 			<div class="quote__main__author" role="heading" aria-level="4">
@@ -71,6 +72,10 @@ export default {
 		RichText,
 	},
 	props: {
+		actorId: {
+			type: String,
+			required: true,
+		},
 		/**
 		 * The sender of the message to be replied to.
 		 */
@@ -145,6 +150,16 @@ export default {
 			return displayName
 		},
 
+		isOwnMessageQuoted() {
+			let actorId = this.actorId
+			if (this.actorType === 'guests') {
+				actorId = 'guest/' + actorId
+			}
+
+			return actorId === this.$store.getters.getActorId()
+				&& this.actorType === this.$store.getters.getActorType()
+		},
+
 		isFileShareMessage() {
 			return this.message === '{file}'
 				&& 'file' in this.messageParameters
@@ -225,11 +240,16 @@ export default {
 @import '../assets/variables';
 
 .quote {
-	border-left: 4px solid var(--color-primary);
+	border-left: 4px solid var(--color-border-dark);
 	margin: 4px 0 4px 8px;
 	padding-left: 8px;
 	display: flex;
 	max-width: $messages-list-max-width - $message-utils-width;
+
+	&.quote-own-message {
+		border-left: 4px solid var(--color-primary);
+	}
+
 	&__main {
 		display: flex;
 		flex-direction: column;